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

Change-Id: I27703e7d341d1e2d06961b470aa87b98d0bd468b