Merge "Fix trivial compiler warnings"
am: 2df83399a6

Change-Id: I352660d434f2166bc7eb03d05971e91fa4c32571