am c983f766: am dd69b14f: Merge "Fix error with remembered sets creation."

* commit 'c983f766a72ba84db36c401dc53551a49d86637c':
  Fix error with remembered sets creation.