Merge "SurfaceUtils: query CONSUMER_IS_PROTECTED" into oc-dev