Merge "NFC: Add Annotations to the HAL file"