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