(Re-add the correct files for 4859558 and fix unity build error.) #rb david.harvey [FYI] luke.thatcher #ROBOMERGE-SOURCE: CL 4859806 via CL 4864758 [CL 4864879 by anthony bills in Main branch]