Merge "Fix static analyzer warnings." am: 95bc0ff0d7 am: 8367747ea5
am: 7f1ec84fd1

Change-Id: I882a57c1a861ab5c6d911bd043630a0ba3bf932a