Merge "Use ParcelableException to put exception in bundle" into rvc-dev