Merge "Remove product_services rules if it's merged away" am: b40f72d0ba am: 38d914132d
am: 04f3b9c9ea

Change-Id: Ib84cedf07300e8e12d2f7f0dbef0885fa98b8cac