merge from open-source master

Change-Id: If02d33af51017dbd85e91c79ac2e848eda6cf253