Merge remote-tracking branch 'origin/master'

Change-Id: I0dd50763393675e529b06439736708cb5ec7f8fb
Signed-off-by: wudongdong <sweetop@189.cn>
the previous commit description is  error.
ps : finish account email