Merge "Move Contacts to /product" am: 2506e5d317 am: c04670b6a3
am: 41e189a032

Change-Id: I313312ea72cbb5f4b46b24033673f9dc3ef3eb49