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

* commit '88c5abb33f0e306a8add10fcef90733aa205799e':
  Make ArrayMap.EMPTY immutable