Merge "Merge "Fixed error that was repeatedly polluting the log" into rvc-dev...
Merge "Merge "Fixed error that was repeatedly polluting the log" into rvc-dev am: 7ca55ee7 am: 77c528e6" into rvc-d1-dev-plus-aosp am: ab9d6b8a
Change-Id: I85d975298a3e736cb503b0b19d2b667fd13b02f9