[automerger skipped] Merge "Return Immediately After Failed RAS Conversion"...
[automerger skipped] Merge "Return Immediately After Failed RAS Conversion" into rvc-dev am: 2da9cb2b -s ours am: ad4f4f87 -s ours
am skip reason: Change-Id Ie829f3909eb217f4382611a80d1d68629f316789 with SHA-1 7ebec4cc is in history
Change-Id: Ic8b89b558e03c743b1f1f969ceaafe81c8b1188f