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

Change-Id: I497397026dafe63a912927cbd1d8a0ca327399f4