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

Change-Id: I14715b308bbf760d5de72348b15d30284e509457