Merge "Move Messaging to /product"
am: 4fa5f17013

Change-Id: I119d06489c572b928a8ba24a7ad1c09c3d214338