Fixing A Few Hacking Violations

Change-Id: I31d49556ae83f453641009dc00b9ba38a0cca662
Merge "Fixing A Few Hacking Violations"