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

Change-Id: Ia3c7f6706ff715382cc9c8f50b6d577a629f185c