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

Change-Id: I05e233ccbf619c7b9f42c73775c8bde7f71198c3