Fix warnings am: 92e272cb1f
am: bbbec7e792

Change-Id: I8d21fb691d0b6bc9ecf5046175a73e635be20931