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