Merge "Fix missing computeIfAbsent() method in L_MR1 and M"