Merge "Correct lookback for while-idle alarm rate limiting" into pi-dev am: b80f4acec7
am: 7088ee74b6

Change-Id: I8808b94ed05ff76d9cd57b9fccfdc7850a264d51