Merge "Update support tab strings." into nyc-mr1-dev am: 623650c898
am: 3f89379170

Change-Id: I5d3b012f334a12a5bf5566906d8100712aa34ff2