Fix Hacking H304 Warnings

And also enable it permanently.

Change-Id: Iae319ecaee86049bc25330e25c4f672e3b158851
Merge "Fix Hacking H304 Warnings"