Merge "Enable custom-cert-child-test trigger"