Update GettingStarted to master

Change-Id: Ied042c802e8a6cfebe2ec2096758a4209d01333f