Merge "Fix clang static analyzer warnings" am: 797da605d0 am: b11b9ab538
am: f8d8a71e1b

Change-Id: Ib910a1a2bc7a5514235d97082b89b67cec616e01