Merge "DO NOT MERGE Update permissions flags for all users before attempting to restore permissions." into qt-qpr1-dev
am: 2048ba8f08

Change-Id: Ifc662ce5825b5c7c1a3cf8533193db1443b2b80b