Merge "modify a minor error in mount_with_alternatives Test: when called with end_idx = null" am: 3080ce2fe4
am: d3435f5d31

Change-Id: If9cd28111e7c8dc2635b27d7bd28fe608eeb78fa