Merge "Fix a bug where + before % is ignored"
am: 11ad605e28

Change-Id: Ia91037ba91e1619d076bd936964125313cde3787