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

Change-Id: I771caf9101eefdc89e029328d424a365e55ca505