Merge "DPC should not be allowed to grant development permission" into oc-dev
am: 5e4b2b15ec

Change-Id: I54c0be2c389aacb367b3c8c7e749475dced25f3c