Hygiene: Static analysis cleanups

Change-Id: I770e47cd92f4f854db7717b0ae484f49261edcf3
Merge "Hygiene: Static analysis cleanups"