Merge changes from topic 'vts-validate-policy-conf' into oc-dev am: 024e0cd27d  -s ours
am: 7b9e6a5300

Change-Id: I93070815310fd288c14046209f8f08e9f6a0e490