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

Change-Id: I737fd2b64a00341b213dc55a68ae4f09400d0f3d