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: c1f3b868 am: 67fb1a16
Change-Id: I0b6077f20907ab433395bbbb07607abcb840f42f