Merge "Add system property to allow testing OTA with the same build image"