Update GuidedTour to master.

Change-Id: If9ec962f2d505d6bde1612874f205908e87f8d75