Merge "Add DSU default userdata partition size" am: 59d40857ad am: 026c077b36 am: 020b636ab7

Change-Id: Iced1e8097a054c73ca5d92170e23182f271a3862