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

Change-Id: I58964396a16b3078c6e7cbff8448b0a20bf2b1ba