Merge "Make sync and remount support product_services."