Merge "Don't modify cached permission info" into oc-mr1-dev
am: 827782af8d

Change-Id: I88676f691883dbd6dc000e9bb840f007bb23cab1