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: e298d9eb am: 14c3126b am: 631cc80e
Change-Id: I65c42019aa74169a70ec16ee7487cd56a6ab9581