Merge "fix typo in DIGEST-MD5 charset" into nyc-mr1-dev am: 356917e790 am: de5bf86ab0
am: 9b0eec35a0

Change-Id: I94ee81a9f3281351ec2bf04305037458dba89cdd