am fa93584a: (-s ours) am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread

* commit 'fa93584a4fab6ca8d9348658dc30cedf76891753':
  Fix policy issues when screen is off. (DO NOT MERGE)