Merge "init: Use ImageManager for DSUs." am: bdaa9afbf2 am: e790acd6cd

Change-Id: I755008dee477528490578e264802faa3f5dd769a