Simplify by using OString

Change-Id: Ia46417525e655a5a80f9e70f25f65e4916e4c8d8