Merge mesa 17.3

Change-Id: I70267b9a6e4f6dfe0dc7a576c43f0fbf03235d3f