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

This reverts commit ba84bf1dec64d745b6efc516799b2c722a672cd9

Hidden dependency resolved.

Change-Id: I9f0844f643abfda8405db2c722a36c847882c392
9 files changed