am 496aeb1a: Merge "Roaming blacklist" into lmp-dev

* commit '496aeb1a6156f3c089135a7ce4fab550589eaff7':
  Roaming blacklist