Merge "Don't modify cached permission info" into oc-mr1-dev