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

Change-Id: Id3692c9293f6e41fb57188e5a7641f913c690a56