Merge commit '31f4b1a8f7772361562d773a207324c611db03cc'
Merge commit 'f8cd848c430e72f533a2b614214391e147c92a2f'
topo.NewTabletInfo
Merge branch 'master' into resharding