Merge "Remove explict use of ASCII encoding" into lmp-mr1-dev