Merge changes Iab5fae74,I3d5076ca into oc-mr1-dev

* changes:
  Tidy up RulesManagerService code
  Remove TODO related to WakeLocks