Merge "Enable GPU protected content" into nyc-dev
am: aa0d986a77

* commit 'aa0d986a774c5cc69cabe8af07e59d1dc2aab257':
  Enable GPU protected content

Change-Id: I5266827fb9684d4fce9ec37e27273e340bf3e3bb