Merge "Rename above and left offset variables." into nextgenv2