Merge "Merge "Logging to aid bug investigation." into rvc-dev am: bb9ea4e1 am: 5bb776d8" into rvc-d1-dev-plus-aosp