Merge "Fix idle timer rule leakage"
am: 44f3896c39

Change-Id: I5ac912d121d094b36d46ccca385d5cf319fcb945
tree: 4e9f6ca9d2646e57c9a6d4dd3b758ab6f91c48ec
  1. core/
  2. services/
  3. tests/