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

Change-Id: I7bc68d630ab99460ab66b13dd5dfbf8b2d7a9e1a