Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec am: f1aea743fd am: d3d23ce12f
am: 6a4e1d0c3a  -s ours

Change-Id: I352d7912a7dfb4b2735c2cf5b58ef4d697b58c73