further tweaking for smokeping

Change-Id: Iebb53f7d0204028dc4543f311e8f6208d3b300c6
Merge "further tweaking for smokeping" into production