Merge "Refactor image handling" into pi-car-dev am: fbdb099752 am: de927b2881 am: 177a4ddcf7
am: 46b05b6b35

Change-Id: I51cce64f8d463fb2b451565f7246bdf9d03bf233