Update GettingStarted to master

Change-Id: I5dcbed45b73bd4d2072c8839151c4f8b113675dd