Merge "Remove tied profile encryption key cache in keystore" into nyc-mr1-dev