Merge "Add eraseIfEqual to ConcurrentMap."
am: 537bac1f59

Change-Id: I11ab9a02652232f3762717f5106db4dd3d7c00d4