Merge "Stopgap fix for credential change of unified-challenge profile" into rvc-dev am: 496c5548 am: 8ab5e4df Change-Id: If142ab1af0ed865457a6740602a459b4a22c78e7