Merge "Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am: bcfa22584b" into oc-mr1-dev