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

Change-Id: I908b67fb00b1e5846601541038c7e856f9234091