Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am: bcfa2258 am: b30749b6 Change-Id: Ie6d0c953dcab31ef98dc68bed1e88e496331f333