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

Change-Id: I3a1b26a7003653053a1e7f9799df1c7e2fa60fc0