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

Change-Id: I586668136884ef0fc69736a484d3204dada35b64