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

Change-Id: I0cceb03e5c37e9d185ffc95124c2ca09dac85db0