merge from open-source master

Change-Id: Iaaf6c1098fc0c5a44a7450d790ccaf2b1d2f64bb