Track more providers from CM

Change-Id: I77a4a66586f3c5c19a2eacd071ef8938aab87d6b