am 231e2474: Merge commit \'c3069c26\' into manualmerge

* commit '231e2474f283dc0a1962b45f1c16c5280a8937df':
  Doc change: updates to location landing.