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

* commit '477226bb63fa357b26a71abd3e9209659efdb337':
  Always set correct policy visibility