Improve recovery compatability (vendor part)

Change-Id: I82ff730bddb8da43a29d8fbb01f412fde6393f85
clean vendorsetup

Change-Id: Id2f135f390fbf6ad4ee11f9c438c37fdab2d5cfc