Merge "Otapreopt: Accept boot image in system"