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

Change-Id: I36289ff0e5d2949d93ecbc0c18e131772706c9cc