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

Change-Id: I80e7885580b9ac17eaf8d7f232684b357b1c84da