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

Change-Id: If0a281e2d8457eebaa2e572f70ef881f6e8fdb94