Merge "Minor changes and cleanup to support EXT_protected_content." into nyc-dev
am: 8506baf

* commit '8506bafe56de56cbfe5880c08ea45109c88ffe71':
  Minor changes and cleanup to support EXT_protected_content.

Change-Id: Ie64cf865e6d8ce3f1436d6cb5d4aa340bdacce58