Merge "Handle managed profile with unified challenge in getHashFactor()" into pi-dev