OTA: Prepare for migration into ROM

Change-Id: I9a88b66a7da73c8338bb506a502ded1f946f455e