Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev