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

Change-Id: Ie98db8eaeadffa5c7a39fd08c41961a798ee8442