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

Change-Id: I5c2b55ac5235ef6721fbbbf9412175a92d247f8d