am e69552ba: Revert "Revert "Various minor policy fixes based on CTS.""

* commit 'e69552ba2d76174d443d1b8457295e4d72f2a986':
  Revert "Revert "Various minor policy fixes based on CTS.""