am: 8f1b2f90
This was reverted in AOSP/Master. It should be CPed into oc-dev as
it cleans up some ERROR log messages.
Test: Manual
Merged-In: Ie26430981b13344f57252edb6dfbcb4cc95b8706
Change-Id: Ie26430981b13344f57252edb6dfbcb4cc95b8706
(cherry picked from commit 27f750d3)