merge from open-source master

Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da