Merge "Update cross-profile error strings and UI" into rvc-dev am: 9f4e9b74d0

Change-Id: I5ef3928305a5de913279c68445f471cd56dd4f84