Merge "Move Messaging to /product"