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

Change-Id: Id41d1203399adef1bae7cc3ee114090fa63ca396