Merge "Fix trivial compiler warnings" am: 2df83399a6 am: c8ec93afd3  -s ours
am: 4a4445a4d2  -s ours

Change-Id: I1f2d319bf247feb09d214d0fe8500c2dbfcb171f