Update GuidedTour to master

Change-Id: Ie7371cdefb4ab21c255de62c570b3e3b75dcaeff