Merge branch 'master' of https://gerrit.lilingkun.com/G12Project

Change-Id: I72535eda24bb4ee2990694006f5e2dc306e31248