Update util classes

Test: mma NetworkRecommendation RunNetworkRecommendationRoboTests
Bug: 34944625

Change-Id: I35495c8a36e3b07caf56cb3882f29ed0f95675a4
8 files changed