SWAT update for cirrus

Grabs:
I1eacfcb41b622b9ed0462acb69cb4a6b96cf8912

Change-Id: I2b41801ee2f38ece300a89252e5e06b7b63ddd27
Merge "SWAT update for cirrus" into wmf/1.25wmf8