Merge "Update support tab strings." into nyc-mr1-dev