Merge "libutils: fix cache removal when callback invalidates the key" am: b0df9dca7c am: e483305e47
am: d2ec24ff7b

* commit 'd2ec24ff7bb9bf0e1b2faa3922d75a28cb013f70':