Merge "Use ParcelableException to put exception in bundle" into rvc-dev am:...
Merge "Use ParcelableException to put exception in bundle" into rvc-dev am: 13c7d899 am: 77000b83 am: 0ae12431 am: faa3b455
Change-Id: I3fedad50afc7be607f658d46abed4f7c77cb7357