am da5a2863: Merge "Always set correct policy visibility" into lmp-mr1-dev

* commit 'da5a28635af883c330fe57e98e78eff127706ed4':
  Always set correct policy visibility