Update GuidedTour to master

Change-Id: Iac9b309f836e96d374f11a90c97f6a7265e5692a