Merge "Fix a bug where + before % is ignored" am: 11ad605e28 am: 9adc83312a
am: 76c76902a6

Change-Id: Id4b1e456f7ce4e7aae84abb96fa55a8fe8f5caa5