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

Change-Id: I84c863b5d2278009db28e0942834f93e93e9c8da