am 75c691a8: am 2f52ec3e: am b1e4a4f2: Merge "fix broken links bug 6879771" into jb-dev

* commit '75c691a8fbf597708e7fad05488e98310c3156f5':
  fix broken links bug 6879771