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

Change-Id: Ie01865b817d2b87b9411a1ed82739d0b7b9a6a5a