Update GuidedTour to master

Change-Id: Ie8ff00f323b31e217a5a0043ca1370675450b8ca