Merge "Fix clang static anaylzer warnings." am: a97d58a21b am: 747d847ff1 am: 802529f46d
am: e7c634a4e5

Change-Id: I17ac8c3b889c78234315b176230a66d650bad733