Merge "Change assist app warning message text" into mnc-dev