merge from open-source master

Change-Id: I01fc38c3021027fcc3a3cea79b1c6564913caa9f