Merge "Attach color space after performing a readback" into pi-dev
am: 5bb709c31e

Change-Id: Ia99aa64858049fbc31ba9fc9480f6feba96b20da