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

Change-Id: I26e0732e120007b312adb7ec346c95594443dccc