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

Change-Id: I78237ef45de114f17768304c8e8417af425f6e0b