merge from open-source master

Change-Id: I518bb4ae9d7269957365561d4d609f22cde519db