Elastica and Cirrus to master.

Change-Id: I9739e7fe337fec8257801ba5c1d6ea39220d05f6