Merge "Add eraseIfEqual to ConcurrentMap." am: 537bac1f59 am: 76eccfe96f
am: e0e4ed7d71

Change-Id: I8f9c9f227df2ac77b2cff5733b7b059fc53e3980