Merge "Recommend different time source" into jb-mr2-dev