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: d716be26 am: c83cd18d am: 1feb4b6f
Change-Id: I8f7dbfe48f02856f0627b32377b7b41e7362d65f