Merge changes from topic "color-auto-legacy-srgb" into pi-dev
am: 96b513cea0

Change-Id: I83065d71e382827bf35e810b70a36f83420145dc