Merge "BUG-2498: optimize enum's forValue() method"