Merge "modify a minor error in mount_with_alternatives Test: when called with...
Merge "modify a minor error in mount_with_alternatives Test: when called with end_idx = null" am: 3080ce2f am: d3435f5d am: 4d592aba
am: 7bda6501
Change-Id: I67f296774e14e1e08a3cfbf3370112dc0f957b0c