Fix some API Analysis problems

Change-Id: I794560018b3d361f7061b2f336775eb867590930

1 file changed