来自SVN的同步

Change-Id: Ia1d88d8b961b3042fd6f700a40685defe66d6905