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

Change-Id: Ic74cc49d92fc6a661be461bca19b77b45e9a3a4e