Merge "Fix static analyzer warnings."
am: 95bc0ff0d7

Change-Id: I1a6a9e858ded5f1c6c7c41453b768a0b234b012e