Merge "Stopgap fix for credential change of unified-challenge profile" into...

Merge "Stopgap fix for credential change of unified-challenge profile" into rvc-dev am: 496c5548 am: 8ab5e4df am: 06835ba7 am: 2b94aa3c

Change-Id: Iad1a53e8a687a4281e3c65077f4a5e4e9a6bea0c