Merge "Stopgap fix for credential change of unified-challenge profile" into rvc-dev am: 496c5548ff am: 8ab5e4df43 am: 06835ba78d am: 2b94aa3c8d am: 9f09b4544c

Change-Id: I6790c52b56a5ca57f284ca78f9fee732a490e356