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

Change-Id: I742b14c4b34b5223aee563ea1a8772158d203057