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

Change-Id: I492f8c7d386c7a90455d48ffa18ad00bebd9ffa8