Merge "Refactor image handling" into pi-car-dev am: fbdb099752
am: de927b2881

Change-Id: I593ae9a5ede7db5f8dc3d36ac482fa08970b3d38