Merge "Fix ProfileSaver logging" into oc-dev