Merge "Stopgap fix for credential change of unified-challenge profile" into rvc-dev am: 496c5548 am: 8ab5e4df Change-Id: I80f892a5b6b3012a3dc979cd17b9a173808e5651