Merge "Resume throwing if too many concurrent alarms" into qt-dev
am: 168f5980f7

Change-Id: I49e06054f87b78f8cbea0d4e756284ba7beb8403