[automerger skipped] Merge "s/product-services/product_services/g" am: de39afd1e0 am: 53af452d80
am: 4541f92425  -s ours

Change-Id: I318b448f94311e42c728db03c1da7e0b2df333b7