Merge "use vector::erase with std::remove_if" am: 01f322e6b1 am: afe7f7e770

Change-Id: I968b1f4916e63a94a8e0bc87570e2e14fce95e3a