am 5a50ecee: am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags"

* commit '5a50ecee40fa2b5e49a8467b35509651f07fb3de':
  A few more grandfathered user tags