On the 'move-tracking-2' branch: catch up to trunk@1691888.
On the 'move-tracking-2' branch: catch up to trunk@1691888.

git-svn-id: 486ec3464084f62cfe8608152673c827b947faa2@1691889 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion