merge pull request from zhanghaojie revert by github

Change-Id: Ic6abcff803753d97d18375b073a721ea531c42d8
Merge "merge pull request from zhanghaojie revert by github"