am 9160b66c: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb

* commit '9160b66c714d9a90d36c235540180cd4c65fed82':
  Fixing the write of BackgroundData setting, DO NOT MERGE.
tree: 5641e8140e41cff592a539512afd03eb70f46b29
  1. core/
  2. services/