add support for non-OTA builds

Change-Id: Ief75de5bc278c135769d0294b7c635fca68a2791