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

Change-Id: Ie6d0c953dcab31ef98dc68bed1e88e496331f333