merge from open-source master

Change-Id: I8ff445963424ee9520f5de46f6ca8d2c3313c819