sideload: mount snapshot partitions before merging am: 58397109ef am: 93b4dd66dd

Change-Id: Ib6a5b9ed559912e9f3e4f285c685c6352f734f74