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

Change-Id: I9197ff85d891117ef9aa8cfd05c7060dba025002