[automerger skipped] use vector::erase with std::remove_if am: 0c52b652 am:...
[automerger skipped] use vector::erase with std::remove_if am: 0c52b652 am: caafff5d -s ours am: dd2ed445 -s ours
am skip reason: Change-Id I9244baf7d6f46cce4c2d8f66fcf57b19c19d32ab with SHA-1 27dc80cd is in history
Change-Id: Ia493906f8e50ac39d17a2fa1ddab983539c6d744