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

* commit '967439b4d1151a613058b1439e1e4240cdef28d9':
  Make ArrayMap.EMPTY immutable