Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev