Merge "Otapreopt: Accept boot image in system" am: 2b65f1c08e
am: aed5afb02d

Change-Id: I21998962936d131650ba3b3ce5ca84182bff1284