Merge \"Fix warnings in HAL.\" am: 1d38b130f3 am: a78d7ae931 am: efdb3339e4
am: 4f02850678

Change-Id: I2d2bc08bdf1cc2550405ce64d521289d5caa6515