Fix SP and CE builds broken by Contact Us changes GitOrigin-RevId: fb9099ed7d755b30ab8706facd6f0d95aefbad1e