Merge "Support multiple DSU installations" am: 32af40977e am: a7d411f7ac am: e83188a786

Change-Id: I316b53687ef01abcaff25b874b67351f6ad517ac