Merge changes I2c38a906,Ie5d758f4

* changes:
  mailtest
  Merge https://gerrit.lilingkun.com/G8Backend into whx