totally lied, more smokeping!

Change-Id: I0f55a2d17bfdc3e0cbcf710e4d6a0e01b1c14c58
Merge "totally lied, more smokeping!" into production