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

Change-Id: Ibe73a33264569b08cac4c00b4dda838f1e5551fc