Merge "Actually correctly call vector::erase after remove_if." am: 2e998d37 am: e7ccd864 am: 8f50d19f am: 138804c6 Change-Id: I665796b52be01ea257cd09ce771c0f629f8b6a47