am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
automerge: abc88d0

* commit 'abc88d0743924441bf7fcd3085e3305b076f5af5':
  Make ArrayMap.EMPTY immutable