Merge "Hide ColorSpace.Renderer" into oc-dev
am: 5094caafc2

Change-Id: I74dad14a0881a69a69ec3f25e111897c29269fdd