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

Change-Id: I1a632d74dd1fae1684259e363f54d158be092f2b