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

Change-Id: Ie38a626cc48f5df867bcbaf489c4b2942fb829c7