am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)

* commit 'c1cbf4525b4d12b6cb7908072d36c8f6ca819f5b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)