Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev