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 am: 9f09b454

Change-Id: I6790c52b56a5ca57f284ca78f9fee732a490e356