Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev