Merge "Remove hot-path logging" into rvc-dev am: b79738ea70 am: 5949f7a355

Change-Id: I3b8a6829742262cd7e00dfaaa8738a2b1814d35c