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

* commit '2f52ec3ef18146c7f70c77dd1afb937461213e01':
  fix broken links bug 6879771