Merge "Lessen EACCES log spam"
am: ed9da87a6e

Change-Id: I2cd1b5c233c9468e6a64e3b75d2324020223efb6