Merge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe
am: 41194d937c

Change-Id: I86f7ca87a54797027949c6d30afe8862f019f34e