OTA: update cp logic

Change-Id: I887fcd22c51be1c5b23c625214009e6a9567f503