Merge "s/product-services/product_services/g"
am: de39afd1e0

Change-Id: I2b43ce767e1d31bdabb421508c9f7c0fade4b98c