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

Change-Id: I4d918122ed20f96fb9281a9ed8ee9e5f28678b1c