Fix google3 issues and pretty-print current.xml

Test: Manually
Change-Id: Ifec81c1b3da7e2e01e6471cdf1c3555dbead93ad
6 files changed