Enterprise string clean-up for O

Bug: 34326838
Test: make
Change-Id: I70db223ea4ef77e791eb7ce98638909442a593aa
4 files changed