Fixed some Hacking violations

Change-Id: I1477ec448fb889881b33983d502bce60c287e997
Merge "Fixed some Hacking violations"