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

Change-Id: I6d0c57812a6af0663f483a26aa037a85cd84838c