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

Change-Id: I498356cf0ae12a05da4a43531036254f3b9dba2a