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

* commit '06fc03d05d3c9d1af4170fb67fd8d074bf4d2f8c':
  A few more grandfathered user tags