merge from open-source master

Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a