Merge "Initial import from ToT git."