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: 3c7be536 am: faa20e6a am: 4115d306
Change-Id: I09998f8d61d1512e182eae5b59fa27d8c0786547