Merge "Exempting allow-while-idle alarms in EBS"