Merge "Merge "Revert "Temporarily enable GL validation"" into oc-dev am: 8f4ac4ac" into oc-dev-plus-aosp