Merge "Move non-public intent out of the public namespace" into oc-mr1-dev am: 3f1ba67f1e
am: ba0f43de1f

Change-Id: I77143a608c7823dddd33a06d77936f7404a46f3d