Merge "Take a couple of wcs MTE patches from upstream FreeBSD." am: 888903aa8a
am: 6023fd759f

Change-Id: Ie3ec7e02ff65947920eb46185ea591132a404dd0