Merge "Adjust choose assist app string" into mnc-dev