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

Change-Id: I3b7b2167a9d3cd492bb9970e9330ca965d0fb843