Merge "Fix ArrayMap.get vs ArrayMap.valueAt typo"