am 6cb8f771: am eb0b5623: Merge "Fix error about multiple unsequenced modifications"

* commit '6cb8f77156f09489e1bb685d306c9f81e3e5dc98':
  Fix error about multiple unsequenced modifications