Update GuidedTour to master

Change-Id: I7c33ac6b69dee952759fff1b3187604fb5ece155