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

Change-Id: Ibfa8d877a945aa9eeef03fd33b7fa26640901792