[fixed] Issue with city tax being added instead of subtracted

Change-Id: I71b221846749424df94537519ff110d9194aa3bd
Merge "[fixed] Issue with city tax being added instead of subtracted" into unstable