Cirrus to master (5e4b5f2)

Change-Id: Ia48e42b4bb24990b4a7d176ec871be26dbf157d4