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 am: 10e54759
Change-Id: I3fbc879863fc1084e4eedc46d0165ac75aa7335d