Add back in Traffic Indicators

Change-Id: I0bda81921229551996da92c979fc172b0d067761