am a955f6a9: am 502cd5ba: am 4a22568d: Merge "Forcing tabs to be single line and width bound (Bug 5646142)" into ics-mr1

* commit 'a955f6a977d46f84a6d9a2fbfcf3ed6c967cf6bb':
  Forcing tabs to be single line and width bound (Bug 5646142)