[automerger skipped] Merge "Lessen EACCES log spam" am: ed9da87a6e
am: 942aec341e  -s ours

Change-Id: I6ace57ec43de1fea92d7569f40220d2c384defbc