One more cirrus to master update

Change-Id: I11ef4424e0694f860923cf4fbc1c43ac0f857a08
Merge "One more cirrus to master update" into wmf/1.23wmf9