Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev