Change recovery for cyano

Change-Id: Ic617b96079c110bd291a491652e0f5b24dee8e65