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