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

Change-Id: I87606bd4b170bcf8b0a76652f9da3892be524059