Merge "Make sure constantIndexing2 is optimized with DEOPT." am: 9ca7d203f2
am: 2c3f75da38

* commit '2c3f75da380e05b18e8af2d8c954335ca9964b48':
  Make sure constantIndexing2 is optimized with DEOPT.