merge from open-source master

Change-Id: Id824d3427cb4808a8768f14e7b46c0eaf5e02e73