Merge "Temporary fix for bugreport symlink." into nyc-dev
am: a9061ece05

* commit 'a9061ece0519755808e84909ad3747462c1fe666':
  Temporary fix for bugreport symlink.