Merge "Only reset time from NITZ in zone fix." into jb-dev