Merge "Fix clang static analyzer warnings."
am: b10d705f51

Change-Id: Ibdd7df4af9766b5d00515254cbb8d5e9370a4971