SWAT update Cirrus

Grabs:
Ie1ddf414f0bcb188dfa536ea9050aeff5f410cf5
I2bd1ccf9116d8702ec2c9978fbc9a4388522a7ee

Change-Id: I8f644bf3a80aadb07fe52d01fc1ce40c5e940c92