Merge "Mount multiple DSU partitions when present." am: e6d71689bb
am: 5787ae1c8c

Change-Id: Icdef4c49b4453a9c5f97fc0427e71b7e90e62fe2