[automerger skipped] Merge "Fix a bug where + before % is ignored" into qt-dev...
[automerger skipped] Merge "Fix a bug where + before % is ignored" into qt-dev am: 55a1d5bd -s ours
am: 243b5c10 -s ours
am skip reason: change_id Ibe73a33264569b08cac4c00b4dda838f1e5551fc with SHA1 76c76902 is in history
Change-Id: Id24dc43d37a453e9dfd1b09b1317f88716f5f3ee