Merge "Fix LingerMonitor notification rate limiting" am: 075e5deba1
am: c1196355c1

Change-Id: I17b180a7dc2d06c54d4a6282414b818b83ecdfdc