[automerger skipped] replace NO_PERMISSIONS with PERMISSION_NONE am: 795f1d13 -s ours
am: 26cd0309 -s ours
am skip reason: change_id If3eb19adc15b6c23c95fc4b9bc699fd1a515e0ac with SHA1 84f48cdf is in history
Change-Id: I9bace3fc4106bc8a2649e8501377c1ddf00ab0d7