am ef4dbb6a: am 5d46b04b: Merge "Recommend different time source" into jb-mr2-dev

* commit 'ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2':
  Recommend different time source