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

Change-Id: I3b918929511c1700cf1f2a2d2a6d1f8848c415f4