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

Change-Id: I51ab9c7e58853ab93b09f1ca9e0c461134157c7d