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
Change-Id: I6faaf45584c32cdc49f0a2ef67226b57c1768cd9