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: 84f9eeb0 am: be8575a8 am: 279782c1 am: 222f94fb
Change-Id: I186e8d2cec256fbcd7d4164cfe022adec234e30c