SWAT update Cirrus

Grabs:
If08a64ab51abf99b5d2517b86791baaa264980a2

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