Merge "Improve JavaAttribute performance"