am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)

* commit '3b916233cbbbcc5bbc703213af5e647910956cbc':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)