Merge "Fix static analyzer warnings" am: f45cf4bfb3
am: 0035f8b5eb

Change-Id: I9e3f91d8de3bf8f15285c437f9949b92766fa514