am d7620bab: Merge "Require optimistic behaviour to pass srcaddr_selection_test"

* commit 'd7620bab199e53821a707c513500bba1ca7f55da':
  Require optimistic behaviour to pass srcaddr_selection_test