am 204e57c4: resolved conflicts for merge of 7521704f to lmp-dev-plus-aosp

* commit '204e57c43824413d6e15fdf05c490ed4d869d44e':
  Fix stale remembered sets error.