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

Change-Id: I635689b5051e503f3cdcb5d06695bca01ea0572a