add traffic

Change-Id: Ic53dccf11a708761d7d908ffe3d0323e44c38c60
Merge branch 'temp' into cm-10.1
Merge branch 'temp' into HEAD