MMV: pull SWAT updates

Change-Id: I6a5994b50f99e732cffdfe4ec7a2e9c9373b86f0