Merge "Minor changes needed to support EXT_protected_content." into nyc-dev