[automerger skipped] Merge "Support loose comparison using minimum matched...

[automerger skipped] Merge "Support loose comparison using minimum matched chars" am: 39ceab0a -s ours am: b251c3d3 -s ours am: fc0152de -s ours am: b9e1d45f -s ours
am: f5ed52e3 -s ours
am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2eb is in history

Change-Id: I120e976bf9c23ff194d34a03d0abc0f20ea0d059