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