SWAT update for Cirrus

Picks up:
  If4aef14368c89391d623475604dc3077f0d022e2

Change-Id: Iec49aaeb2ec3ce3bd090a8afc50dfc5b927a5726