Track local Contacts

Change-Id: Ia013854846279b0dbe5a01c8e74202e851b58230
Merge "Track local Contacts" into jb-mr2