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

Change-Id: I4cdef151e4a826cee965954352f101c3bdd86d09