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

Change-Id: I3f576f983f23e9ea0c32fdfa034e47215b293970