Update GuidedTour to master

Change-Id: I5554f6923f0ec984adec4db4dea04356db1fdb76