am abe13862: Merge "Improve tracking of memory locations in LVN."

* commit 'abe13862e29656a0ff2ee69828c391f136abd194':
  Improve tracking of memory locations in LVN.