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

* commit 'd928ad61e87ce8ecc1a7edae26bced459c923859':
  PixelCopy fixes

Change-Id: Iaae3de7f8fd4b90856006bd7e4d3823a61168810