Merge "Fix isAod flag in onAodInterrupt()" into main