Merge changes from topic "networkscoremanager-cachefilter" am: 427cb398e2 am: 17d1e1e11a

Change-Id: Ic12be3e4dbdd9a6c1bc8b8516e3f0a6e6cc29357