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

Change-Id: I34b83d6c5690929f002d4fe5422eefba6397a790