diff --git a/external/Java.Interop b/external/Java.Interop
index 7574f166008..fdc200cca56 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 7574f166008bb45c0df97315aae7907ac25f8602
+Subproject commit fdc200cca5676660dd8f732f4d7eef7716daa3df
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets
index 7d61a578409..0c986cf825f 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets
@@ -19,9 +19,7 @@ This file is only used by binding projects.
       Outputs="$(ApiOutputFile)">
 
     <ItemGroup>
-      <!-- TODO: add when `ClassPath` supports `<api api-source="java-source-utils">`
       <_AndroidDocumentationPath Include="@(_JavaSourceJavadocXml)" />
-        -->
       <_AndroidDocumentationPath Include="@(JavaDocIndex->'%(RootDir)\%(Directory)')" />
       <_AndroidDocumentationPath Include="$(JavaDocPaths)" />
       <_AndroidDocumentationPath Include="$(Java7DocPaths)" />
diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs
index 9a1332d4a07..f4c6a07d8ce 100644
--- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs
+++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs
@@ -66,14 +66,14 @@ public void Arrays ()
 		{
 			using (var dh = new Com.Xamarin.Android.DataHandler ()) {
 				EventHandler<Com.Xamarin.Android.DataEventArgs> h = (o, e) => {
-					Assert.AreEqual ("fromNode", e.P0);
-					Assert.AreEqual ("fromChannel", e.P1);
-					Assert.AreEqual ("payloadType", e.P2);
-					for (int i = 0; i < e.P3.Length; ++i) {
-						for (int j = 0; j < e.P3 [i].Length; ++j) {
+					Assert.AreEqual ("fromNode", e.FromNode);
+					Assert.AreEqual ("fromChannel", e.FromChannel);
+					Assert.AreEqual ("payloadType", e.PayloadType);
+					for (int i = 0; i < e.Payload.Length; ++i) {
+						for (int j = 0; j < e.Payload [i].Length; ++j) {
 							byte expected = (byte) (((i+1)*10) + (j+1));
-							Assert.AreEqual ((byte)(expected + 'J'), e.P3 [i][j]);
-							e.P3 [i][j] = expected;
+							Assert.AreEqual ((byte)(expected + 'J'), e.Payload [i][j]);
+							e.Payload [i][j] = expected;
 						}
 					}
 				};