am f76331a9: am 81aedc7b: Merge "Refactor and improve GC root handling"

* commit 'f76331a96648c7f1ccc0ad8c2a362db65d6e3485':
  Refactor and improve GC root handling