smokeping updates

Change-Id: I11ea83d4bce2b7112574fdbe2b1cabfe55d1b38d
Merge "smokeping updates" into production