Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev