More Hacking Violation Fixes

These are more fixes to bring the code in compliance with hacking violations.

Change-Id: I92ebacb6250cdaadb792dbfd81b9fee35358def9
Merge "More Hacking Violation Fixes"