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

* commit '79d33b2b5273afa10b6ffc1382278757492c6720':
  Fix error about multiple unsequenced modifications