Merge "Expose some level of logging to aid debugging. am: bc86158b am: 66fbe163 am: dfb995d6" into rvc-qpr-dev-plus-aosp