Merge "Fix static analyzer warnings" am: 7176951b9b
am: 34abe0cf5c

Change-Id: I1472b8624576dd8790b3d975b338c6597b4dd553