Merge "Fix clang static analyzer warnings." am: 1226a847e4
am: c63fb3cc14

Change-Id: I291f07c45a0947d5c3218d710186e20ecc429677