Merge "Fix string breakage." into lmp-mr1-wfc-dev