NXP-11516 Raw backport from 5.7 (history is not really replayable)
NXP-11516 Replace guava by google-collections