Revert "Revert "Correct R and G offsets for correct mapping""

This reverts commit 550d21efd6c7d2b98ed80bb661c4768891f06fc9.