Merge remote-tracking branch 'remotes/mesa/17.2' into merge

Change-Id: I8bfcd1eaefb30e59ef6543c71ef1727478bfade2