Update GuidedTour to master

Change-Id: I111ec1ff25c7d4e7447968d3876c748aca7610db
Merge "Update GuidedTour to master" into wmf/1.22wmf16