Merge "Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15 am: f1aea743 am: 0b80fb29" into oc-mr1-dev-plus-aosp