Fix the new hacking rules

Change-Id: I256512780251b6c552af6babac3c0677c204aaaa
Merge "Fix the new hacking rules"