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

Change-Id: I54f7a82a46f1dc25c4cb1383d66e0fd22ae628ed