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

Change-Id: I3b03f5985137a57e7c3ed3b2e0030078a4ea676d