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

Change-Id: I6c1dc70ac7d354dcda2defdee0ef83cf055993e0