Merge changes from topic "mesa3d_18" am: 662491d22c am: 5559701ed1
am: 556bc6a533

Change-Id: I6de9c3cb99c21ce590128eaceba633a0d9a3f067