am 1d583d99: am 5b2f2912: Nuke author tags and update Manifest that I accidentally left out of the previous CL.

Merge commit '1d583d99cf2cc8eb7bd77492a5823122f3197436'

* commit '1d583d99cf2cc8eb7bd77492a5823122f3197436':
  Nuke author tags and update Manifest that I