Update GettingStarted to master

Change-Id: Ifeb05404e058a66d35ec2f49349ed2a31b1a3ed2