Merge "Simplify CTS testing for policies that apply to DO and PO" into mnc-dev