Merge "Honor TARGET_NO_RECOVERY flag."