Merge "Fix typos in ClipData JavaDoc" into nyc-dev