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