Merge "Do not cache profiles in the ProfileSaver." into oc-dev