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

Change-Id: I60e31f7734b28954ab110292466826b376184798