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

Change-Id: If273b1fdb350f8b7a080209ca4a9fa85592b00fc