Update GuidedTour to master

Change-Id: I66beafe6f2b46f3ba48881cc551197dae1b3f378