am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge

* commit '997d00428c420ba8c2175c7c2e28f14d54abd0b9':
  Doc change: updates to location landing.