Merge "Fix for a test broken due to removing logcat msgs" into rvc-dev am: 84f9eeb0 am: be8575a8 am: c1f3b868 Change-Id: I810ed058b88860ea8ba7c55eaeb60e23ea6f0718