Cirrus to master (5e4b5f2)

Change-Id: I49f281a1c57fb7422e09218d65076a1d6cd0671c