Merge "Fix clang static analyzer warnings." am: b10d705f51 am: 87b2535ff8
am: 0405b428f8

Change-Id: I23292033bc37b2dcb8f254be2cfacc21e67deaaf