Merge "Fix analytics in Contacts app" into lmp-mr1-dev