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

Change-Id: I88682dd80af09d71a4759cf370a2538ddc5866c2