Merge "Fix a leak in HasSystemFeatureCache." into rvc-dev am: 675a58b2ce

Change-Id: Ie586ca8a973a312d260bb634a5a438ea7f5ea1e0