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
am: 88a15e9889

Change-Id: I0df14fdfc0a6ccce214919d15561144b84518783