merge from open-source master

Change-Id: I7b7a0174af75b7b37b9f1c5dc0adf39ab5b9d332