Merge "Check USE_GOMA consistently"