SWAT update Cirrus

Grabs:
If4f0faf51c145d067996da70afb8842ad38ab106
Ib2d61e5153c5415d4f00ed4dfc26e524f3c14ab0
I3c7d0eb67e33335f08472d8d8c0518ad9b9a009a
I9807023baa2fa8c4e4a5a79cf38d1c372462ddfb

Change-Id: I076f2b619f6b20f1ffeafee0a3d886e8eaff35fa