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

Change-Id: If42bf61dbaac6796b46cc1cc80c138003cb093c6