Merge "Fix Automatic time zone not working when no NITZ received."