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

Change-Id: Ibedb132594d4f00b01d04e80516f53a455df82d1