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

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