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