Merge "custom_image: fix build break" am: 52897d4ecb
am: ab0ae8e728

Change-Id: I20aa30f30bafcfb49b39c0d69b87ed5e7e4ecae5