SWAT update Cirrus

Picks up:
  If4aef14368c89391d623475604dc3077f0d022e2

Change-Id: I6f4d9268877c2c1105959db8bc3c6555d8823460