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

Change-Id: If6399b019941e07eb04b753c4cd28e4d69112efb