am 2f655fb: am 24a8fe8: AI 148797: Back-port the new version of the Grid

Merge commit '2f655fb365ae518683c4b91647dc5bdaeb69ecbc'

* commit '2f655fb365ae518683c4b91647dc5bdaeb69ecbc':
  AI 148797: Back-port the new version of the Grid.java from Donut.