Merge "Merge "Check for null HAT and add logging" into rvc-dev am: 90b27662...
Merge "Merge "Check for null HAT and add logging" into rvc-dev am: 90b27662 am: 6fdc18ad" into rvc-d1-dev-plus-aosp am: 158066f7
Change-Id: I21eb97e940e8eec6f98592ca0f59d4019506b74a