am 4f402882: Merge "Remove uniform block tests using double underscore." into mnc...