Merge "Proper handling of unrecoverable status." into rvc-dev am: c7b99da139 am: 2a31a4a68a am: b14c5341b0 am: 652b499821
Change-Id: I22ed51ca8d81d71123056dec5bb418eaf59bbde6
This commit is contained in: