Enable gating on H904 and fix existing violations

Change-Id: I246e5e13ef08383bb38fc896dfd68dd4bdd76c6d
Merge "Enable gating on H904 and fix existing violations"