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

Change-Id: I07fe6a89c872a93b32b82b098270772a80ef4f06