Merge "Refactor image handling" into pi-car-dev am: 3847e55e9b am: cca24ac5e4 am: c61e17aa3f
am: d88a292bfb

Change-Id: Ie6bd2233495bb41eed428c161b23cec5c05bd821