Merge "NFC: Clean up code to fix misdiagnosed unitialized variables (r2, g2, b2)."
am: babf98b776

Change-Id: Ic108deb2b7c4eebc04e0e13d377b575eee95a19f