Merge "Support multiple DSU installations"
am: 69d181aecc

Change-Id: I92e75dcf4bd28f3b9ad6fc876f155d772b3124a5