Update GettingStarted & GuidedTour to master

Change-Id: Ifa8930c40c3edbbb98944abb46db3f90c7113720