Merge "Don't set the time zone under the caller's identity" into jb-mr1-dev