am 40cd4515: am 78b4977e: Merge "Ensure that Vector::erase() returns a valid...
am 40cd4515: am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev
* commit '40cd4515':
Ensure that Vector::erase() returns a valid iterator