Merge "Stopgap fix for credential change of unified-challenge profile" into rvc-dev am: 496c5548ff

Change-Id: Ic7ef3f2399c25d89998ecaa2ba60be85da34fc43