Merge "Change nullability of colorspace parameter" into oc-dev am: 944782fac2
am: 1c32d2cd98

Change-Id: I92853da836ce26801b9350cb1f65664e58e15d47