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

Change-Id: I6f8a30e44cd18bb0105c65e664d6411896b70be7