SWAT update Cirrus

Picks up:
 I7586162cfb32ddbe460a25c956c845f2f4a49b0f

Change-Id: Id2faa864e7e077c0238cfc7ad90a1934e9428649
Merge "SWAT update Cirrus" into wmf/1.25wmf7