Merge "Move Contacts to /product"
am: 2506e5d317

Change-Id: Ife33eb9ce3ef59b17ff466274de3b780deb238f9