Merge "Remove use of strencode() in buildLike()"