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

Change-Id: I80528c41ac9fae0d6427f8c2422c6ee393476837