Merge "Add useful app-op-note message to async Location deliveries"