SIO-1115 locale workaround on some systems

Change-Id: I54140291ef6a20235b00f2003ef9151fba3d656c
Merge "SIO-1115 locale workaround on some systems"