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