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

Change-Id: Icc52318a03ac1a196cb328e9144b9a20e785931a