Remove hardcoded percent signs

Change-Id: Iaaade2dee7dc3994f60c0bd127b35b08db673909