Merge "Simulate handling of event when throttling" into pi-dev am: 0458578642
am: 64bc4fab47

Change-Id: I2f87a69a1836cc9b109e78e49b3d0085bfb32b81