Merge "Increase clip debug string limit" into mnc-dev