Elastica and Cirrus to master.

Change-Id: I9a1e41714b0150b31cbead4192b27d5140be77f6