Merge "Fix static analyzer warnings" am: 19921b70fe am: 25c66b014d am: 33263db50a
am: e561438599

Change-Id: I61dbce28f06dee1b9617a65541b52b95d6806c1c