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

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