Less spammy. (cherry picked from commit c5adebc9) Bug: 17405090 Change-Id: Ib78d0d7bc31a88182cb9d85ddba9b469bd50324b