Merge "Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds." into nyc-dev am: 61ed44b678
am: e00a9ba3b5

Change-Id: Ia3121c4513cbafab10bee0faf3c97e6e626b7c78