Merge "Fix for a test broken due to removing logcat msgs" into rvc-dev