Merge "Apply API feedback for ChooserTarget" into mnc-dev