AI 145851: am: CL 145516 Use the new binary format for the empty dictionary.   This makes it compatible with the current code and avoid any possible crash.   Original author: yamasani   Merged from: //branches/cupcake/...
AI 145851: am: CL 145516 Use the new binary format for the empty dictionary.
  This makes it compatible with the current code and avoid any possible crash.
  Original author: yamasani
  Merged from: //branches/cupcake/...

Automated import of CL 145851

klausw/hackerskeyboard,klausw/hackerskeyboard,klausw/hackerskeyboard,klausw/hackerskeyboard