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

Change-Id: Ifbfd29108d9cacf0ce0f45ee643ea21685a5a0af