Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1