* stable-4.10: ResolveMerger: Fix encoding with string; use bytes Change-Id: I2f02298d0ff7caafeca4020cde4fdfa29a46e585 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>