Merge "Expose some level of logging to aid debugging. am: bc86158b25 am: 66fbe163fe am: dfb995d6b8" into rvc-qpr-dev-plus-aosp