AOSP recovery for devices that cannot handle CSR

Change-Id: Ib4d4d1ffc8219a221417df82812ed4113fc30100
My Repo Changes

Change-Id: I382c5b0dd3ddc652c1df815f0871dc8ba083aadd