Update GuidedTour to master

Change-Id: Ia31c1d62ae7080727d8815cec0d7e4a0289fec60