Update GettingStarted to master

Change-Id: I63d11217839b3c69adc8b4e4d2d294024604dfb7