Cirrus to master (1e652e7d)

Change-Id: I60559ed11730387f8c19081b5e899d40882a15d5
Merge "Cirrus to master (1e652e7d)" into wmf/1.22wmf19