Fixing Cirrus for 1.22wmf17

Change-Id: If1874eec4e1543a13aeec7c1fa6b1d16ce9fb4ab