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

* commit 'aa0acfc8761fc8802879f90511b904061a523ed2':
  Doc change: updates to location landing.