Merge "Null locale causing the VTS fail."