Update

Change-Id: I53f52bb4e6e333a7165697457e6a7aab960aad06

Conflicts:
	envsetup.sh