Merge change 22049 into eclair

* changes:
  Fix various issues found when testing Mms.