merge from open-source master

Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d