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

Change-Id: I9d99b3f18aa86e8dd62cb9e9ec95b86b16895dbf