Switch to upstream branch 1012

Change-Id: I617b748146e7661440cd3ddda8f4705a02a4b926