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

Change-Id: I50023e13c9beff766405cd3bdccfb71da7c766c9