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

Change-Id: I2f61e53e70b814f246cc4683e2b60dfd665ec642