Merge "Fix incorrect boot time locale." into nyc-dev