Merge "Revert "Various minor policy fixes based on CTS.""