track local Contacts & Contacts Provider

Change-Id: I1c7d6a8cd78bf61cadc2e4ec6cb42b5bef77f625
fix derp

Change-Id: Id7cd5ee6fadac27e053816adeeb048eead8ff4ed
track local nfc modules

Change-Id: I916aca10bf67b279ad4d6e95a11503b6c8d18d29
fix derp

Change-Id: Ibd9b33a2f4cee0ed1b15704eaf031527e2261b85
Merge branch 'jb-devel-release' into jb-devel-release-i9505