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

Change-Id: I67f296774e14e1e08a3cfbf3370112dc0f957b0c