merge from open-source master

Change-Id: Iafcb89bdab1495c869569f7063e6c775898dedfc