Merge "Fix unsigned type sub overflow issue when isntall DSU"
am: 747aa9a49b

Change-Id: I3e3db3453d3018939bdbf0ee40e4dde2efdc08bc