merge from open-source master

Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4