SWAT update Cirrus

Grabs:
I2bd1ccf9116d8702ec2c9978fbc9a4388522a7ee
Ic037f0901984671679a46d1e894f69edee888136
Ie1ddf414f0bcb188dfa536ea9050aeff5f410cf5

Change-Id: I658d84c301f741b6e0ad514da986a4749f1d0512
Merge "SWAT update Cirrus" into wmf/1.24wmf22