Merge "(Really) fix LingerMonitor rate limiting" am: 26213ed916
am: f506b778a9

Change-Id: I55d69d0bf1102b4159db5ffb4a37684f7a676008