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
am: 7b3142be87

Change-Id: I7b0e15f229db864f8db67cfa3564592fd8e3bd71