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

Change-Id: I9e6b80d351eb56058d029ac295686353c23dfb8d