Merge "Correctly call vector::erase after std::remove_if." am: 9f69fc71 am: f2cec8eb am: 1b1ac10c am: 4e0da3aa Change-Id: Ib13446a13aaff0da7e7d7e5742874e4d184872bc