Merge "Support multiple DSU installations" am: 69d181aecc am: fd9ae75440

Change-Id: I236a00274d6b6e7d1c7ac134ef17232c368cdd6a