SWAT update Cirrus

Grabs:
  I7586162cfb32ddbe460a25c956c845f2f4a49b0f

Change-Id: I8cfac33e421d6b75655d436f1e5c033026b7f974
Merge "SWAT update Cirrus" into wmf/1.25wmf8