Updating Cirrus to master

Change-Id: Iae7dd2337eb2f377c8ca0fd3e62c12e5e991ec93
Merge "Updating Cirrus to master" into wmf/1.22wmf12