diff --git a/docs/html-intl/intl/es/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd
similarity index 93%
rename from docs/html-intl/intl/es/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/es/training/articles/scoped-directory-access.jd
index e423e6ae3d81d..67f9ad672d760 100644
--- a/docs/html-intl/intl/es/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd
@@ -71,8 +71,8 @@ startActivityForResult(intent, request_code);
 <p>El sistema intenta otorgar acceso al directorio externo y, si
 es necesario, confirma el acceso con el usuario usando una IU simplificada:</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>Imagen 1.</strong> Una aplicación solicitando
 acceso al directorio Pictures.</p>
 
@@ -138,8 +138,8 @@ acceso inmediatamente. Hacer esto provocaría una mala experiencia
 de usuario. Si el usuario deniega una solicitud y la aplicación solicita acceso
  nuevamente, aparece la casilla de verificación <b>Don't ask again</b> en la IU:</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
 <p class="img-caption"><strong>Figura 1.</strong> Una aplicación que presenta una
 segunda solicitud para obtener acceso a medios extraíbles.</p>
 
diff --git a/docs/html-intl/intl/in/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd
similarity index 93%
rename from docs/html-intl/intl/in/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/in/training/articles/scoped-directory-access.jd
index d557e96d10f71..855993f0b15c5 100644
--- a/docs/html-intl/intl/in/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd
@@ -71,8 +71,8 @@ startActivityForResult(intent, request_code);
 <p>Sistem ini mencoba untuk memberikan akses ke direktori eksternal, dan jika
 diperlukan mengonfirmasi akses dengan pengguna menggunakan UI yang disederhanakan:</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>Gambar 1.</strong> Sebuah aplikasi yang meminta
 akses ke direktori Pictures.</p>
 
@@ -138,8 +138,8 @@ meminta akses lagi. Berulang kali meminta akses akan menghasilkan pengalaman
 pengguna yang buruk. Jika permintaan ditolak oleh pengguna, dan aplikasi meminta akses
 lagi, UI akan menampilkan kotak centang <b>Don't ask again</b>:</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
 <p class="img-caption"><strong>Gambar 1.</strong> Sebuah aplikasi membuat
 permintaan kedua untuk mengakses media lepas-pasang.</p>
 
diff --git a/docs/html-intl/intl/ja/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd
similarity index 94%
rename from docs/html-intl/intl/ja/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd
index e4f9ae21769df..32681a03620ef 100644
--- a/docs/html-intl/intl/ja/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd
@@ -71,8 +71,8 @@ startActivityForResult(intent, request_code);
 <p>システムは外部ディレクトリへのアクセスの付与を試行し、必要に応じてシンプルな UI で、ユーザーにアクセスを確認します。
 </p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>図 1.</strong> Pictures ディレクトリへのアクセスを要求するアプリ
 </p>
 
@@ -138,8 +138,8 @@ startActivityForResult(intent, request_code);
 リクエストがユーザーにより拒否され、アプリが再度アクセスをリクエストすると、UI に [<b>Don't ask again</b>] チェックボックスが表示されます。
 </p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
 <p class="img-caption"><strong>図 1.</strong> リムーバブル メディアへのアクセスに対して 2 回目のリクエストを行うアプリ。
 </p>
 
diff --git a/docs/html-intl/intl/ko/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd
similarity index 93%
rename from docs/html-intl/intl/ko/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd
index 2fe02b12f35f9..efd05f3e3a69d 100644
--- a/docs/html-intl/intl/ko/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd
@@ -71,8 +71,8 @@ startActivityForResult(intent, request_code);
 <p>시스템이 외부 디렉터리에 액세스 권한을 부여하고자 시도하고,
 필요에 따라 단순화된 UI를 사용하는 사용자의 액세스를 확인합니다.</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>그림 1.</strong> Pictures 디렉터리에
 액세스를 요청하는 애플리케이션.</p>
 
@@ -138,8 +138,8 @@ startActivityForResult(intent, request_code);
 사용자 환경을 저해하는 결과를 낳습니다. 사용자가 요청을 거부하는데 앱이 다시 액세스를
 요청하면, UI에 <b>Don't ask again</b> 체크박스가 표시됩니다.</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
 <p class="img-caption"><strong>그림 1.</strong> 이동식 미디어에 대해
 다시 액세스 요청을 하는 애플리케이션.</p>
 
diff --git a/docs/html-intl/intl/pt-br/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd
similarity index 93%
rename from docs/html-intl/intl/pt-br/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd
index 6a58d7656646b..a4c51abe3398c 100644
--- a/docs/html-intl/intl/pt-br/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd
@@ -71,8 +71,8 @@ startActivityForResult(intent, request_code);
 <p>O sistema tenta conceder acesso ao diretório externo e,
 se necessário, confirma o acesso com o usuário usando uma IU simplificada:</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>Figura 1.</strong> Um aplicativo solicitando
 acesso ao diretório Pictures.</p>
 
@@ -138,8 +138,8 @@ solicitação imediatamente. Insistir em solicitações de acesso repetidas veze
 negativa para o usuário. Se uma solicitação for negada pelo usuário e o aplicativo solicitar acesso
 novamente, a IU exibirá uma caixa de seleção <b>Não perguntar novamente</b>.</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
 <p class="img-caption"><strong>Figura 1.</strong> Um aplicativo que faz uma
 segunda solicitação para acesso à mídia removível.</p>
 
diff --git a/docs/html-intl/intl/ru/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd
similarity index 97%
rename from docs/html-intl/intl/ru/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd
index 51a4c4d55f791..f70c92c4e14dd 100644
--- a/docs/html-intl/intl/ru/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd
@@ -57,8 +57,8 @@ startActivityForResult(intent, request_code);
 <p>Система пытается предоставить доступ к внешнему каталогу и, при необходимости,
 запрашивает подтверждение доступа у пользователя с помощью упрощенного пользовательского интерфейса:</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>Рисунок 1.</strong> Приложение запрашивает
 доступ к каталогу Pictures.</p>
 
diff --git a/docs/html-intl/intl/vi/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd
similarity index 96%
rename from docs/html-intl/intl/vi/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd
index d6db0ece657af..d3b71743dcaee 100644
--- a/docs/html-intl/intl/vi/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd
@@ -57,8 +57,8 @@ startActivityForResult(intent, request_code);
 <p>Hệ thống sẽ cố gắng cấp quyền truy cập tới thư mục bên ngoài và nếu
 cần sẽ xác nhận quyền truy cập với người dùng bằng một UI được đơn giản hóa:</p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>Hình 1.</strong> Một ứng dụng yêu cầu
 truy cập tới thư mục Pictures.</p>
 
diff --git a/docs/html-intl/intl/zh-cn/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd
similarity index 92%
rename from docs/html-intl/intl/zh-cn/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd
index 4ff5f3610eab3..6473fc85c8d53 100644
--- a/docs/html-intl/intl/zh-cn/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd
@@ -75,8 +75,8 @@ startActivityForResult(intent, request_code);
 <p>系统尝试授予对外部目录的访问权限，并使用一个简化的 UI 向用户确认访问权限（如果需要）：
 </p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>图 1.</strong> 一个请求访问 Pictures 目录的应用。
 </p>
 
@@ -142,8 +142,8 @@ startActivityForResult(intent, request_code);
 如果用户拒绝了一项请求，而应用再次请求访问，UI 会显示一个 <b>Don't ask again</b> 复选框：
 </p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
 <p class="img-caption"><strong>图 1.</strong> 应用第二次请求访问可移动介质。
 </p>
 
diff --git a/docs/html-intl/intl/zh-tw/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd
similarity index 95%
rename from docs/html-intl/intl/zh-tw/preview/features/scoped-folder-access.jd
rename to docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd
index 0a530d23f9265..0aa0034a1d1e9 100644
--- a/docs/html-intl/intl/zh-tw/preview/features/scoped-folder-access.jd
+++ b/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd
@@ -57,8 +57,8 @@ startActivityForResult(intent, request_code);
 <p>系統會嘗試授予對外部目錄的存取權，並在需要時使用簡化的 UI 向使用者確認存取權：
 </p>
 
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
 <p class="img-caption"><strong>圖 1.</strong> 應用程式要求對 [圖片] 目錄的存取權。
 </p>