Update GuidedTour to master

Change-Id: Iab89fcdb47283ebe1ae02e71d8b3385ab3c2a118