Updating Cirrus to master

Change-Id: I7901eb724fb24d4ed5b623bb3804f5f821ce9793