Merge changes Ic9531e3c,I3f04433b into froyo

* changes:
  Cherry pick from master.
  Cherry pick from master.