Initally used a new sniff with autofix (T333745) Bug: T332865 Change-Id: Idd94bf5deedd4a06039205192435f0abdd827d64