Merge "Move non-public intent out of the public namespace" into oc-mr1-dev