Merge "Add P back to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp