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

Change-Id: I916be4633f0372d68a4d952e0e423558e62cc040