Merge "Remove product_services rules if it's merged away"
am: b40f72d0ba

Change-Id: I9ec3e3bc2619a716dea5b349c83947f750e33317