Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev
am: 7dedfd0c04

* commit '7dedfd0c0486bb7d8b12b767e026bfdb2267f8e7':
  Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy...

Change-Id: I8bf52b74090068eddbc0190a12a8f42013b3f048