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