Merge "PixelCopy fixes" into nyc-dev
am: a5bbbe5

* commit 'a5bbbe55b74d3a835b64fa18959f487da2df967e':
  PixelCopy fixes

Change-Id: I4a49425cea5316ac4c977432c60caf9a6f667b76