Updating Cirrus to latest commits in 1.24wmf20

Change-Id: I6c20bbf671ffaed392cc7234906c5c9b953cb2df