Merge change Iaad9c8d1 into eclair-mr2

* changes:
  Restore 7.xml.