[automerger skipped] DO NOT MERGE Update permissions flags for all users before attempting to restore permissions. am: df93293342
am: 29c57f1377 -s ours
am skip reason: subject contains skip directive

Change-Id: Ife11f1cf3de7e7dd7d554d33438c4c3d07b809f8