Merge "Fix for a test broken due to removing logcat msgs" into rvc-dev am:...
Merge "Fix for a test broken due to removing logcat msgs" into rvc-dev am: 621db815 am: d21e6f3e am: ffc030df am: f320dad3 am: 5c0dbdb0
Change-Id: I50183ba7697f73f4010d129bb0b3e31460073d25