am 23aa4774: am 904ffedb: am 36b58ea9: am d6e176c8: am 2c1669c4: Merge "Doc...

am 23aa4774: am 904ffedb: am 36b58ea9: am d6e176c8: am 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev

# Via Android Git Automerger (4) and others
* commit '23aa4774':
  Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.