am 6588c7cf: (-s ours) am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb

* commit '6588c7cf73a9d09cad1fa5d4e558a55a5e5e18df':
  DO NOT MERGE Add support for background scanning