Update to support new version of Cirrus

Required to support Cirrus's I2d92dc973a66180dc39c646254ce9b11ec269edc.

Change-Id: I9ef99b414a82e5e987edc1f7bef0dc5e78365ed9