ID: 3614609 - Codes with Percentages Stop Working After Update to SOB

Change-Id: Ib44d7db057a0ba4895fcdf96efd345e567edf719
Merge "ID: 3614609 - Codes with Percentages Stop Working After Update to SOB" into RELEASE_12_1