am f724dbf7: Merge from gingerbread

* commit 'f724dbf7cb697f947d761afc34b23971278452a8':
  2.3.1