Fixes for many warnings

Test: Local build 32+64

Change-Id: I75270464c3d394e955f37d996380ef1d0364aa80
Merged-In: I75270464c3d394e955f37d996380ef1d0364aa80
(cherry picked from commit 78d26a96e453a2f870f1945f055a27d426baf6f9)
(cherry picked from commit 9bb5971be179afea581d22a603b11561d56b9aae)