merge from open-source master

Change-Id: I92f883cfb85aa01ca0b857bce19c444fd239dbfa