Merge "Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am: 242f5798ac am: a5e5cf6a84" into nyc-mr1-dev-plus-aosp