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

Change-Id: I0417e545275dca24efdf296442f4cbfb0ff69c7e