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

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