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

* commit 'f273723f7710bb127ee1026e05049e4ee5290c8a':
  A few more grandfathered user tags