Merge "Fix idle timer rule leakage"
am: 9367b9ea4c

Change-Id: I5ac912d121d094b36d46ccca385d5cf319fcb945