The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/93810102c790b3712faee298482539bfff693e49

commit 93810102c790b3712faee298482539bfff693e49
Author: Wenzhao Zang <wzang@chromium.org>
Date: Tue Aug 01 22:10:40 2017

Update Welcome App texts based on voice interaction status

The texts of the first step (launcher) of Welcome App should be
customized based on if voice interaction (Assistant) is enabled.

Bug:  750941 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I2d53c2e5c8e6e0d579f1564c7793d27fde96d172
Reviewed-on: https://chromium-review.googlesource.com/595111
Commit-Queue: Wenzhao (Colin) Zang <wzang@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491129}
[modify] https://crrev.com/93810102c790b3712faee298482539bfff693e49/chrome/browser/resources/chromeos/first_run/app_list_step.html
[modify] https://crrev.com/93810102c790b3712faee298482539bfff693e49/chrome/browser/resources/chromeos/first_run/first_run.js
[modify] https://crrev.com/93810102c790b3712faee298482539bfff693e49/chrome/browser/resources/chromeos/first_run/step.js
[modify] https://crrev.com/93810102c790b3712faee298482539bfff693e49/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc

This bug requires manual review: M61 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), ketakid@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Approving merge to M61 Chrome OS.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0c8e16bd2b7998d4eb17c4eba8d08126f39932be

commit 0c8e16bd2b7998d4eb17c4eba8d08126f39932be
Author: Wenzhao Zang <wzang@chromium.org>
Date: Thu Aug 10 01:07:09 2017

Update Welcome App texts based on voice interaction status

The texts of the first step (launcher) of Welcome App should be
customized based on if voice interaction (Assistant) is enabled.

TBR=wzang@chromium.org

(cherry picked from commit 93810102c790b3712faee298482539bfff693e49)

Bug:  750941 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I2d53c2e5c8e6e0d579f1564c7793d27fde96d172
Reviewed-on: https://chromium-review.googlesource.com/595111
Commit-Queue: Wenzhao (Colin) Zang <wzang@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#491129}
Reviewed-on: https://chromium-review.googlesource.com/609535
Reviewed-by: Wenzhao (Colin) Zang <wzang@chromium.org>
Cr-Commit-Position: refs/branch-heads/3163@{#423}
Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
[modify] https://crrev.com/0c8e16bd2b7998d4eb17c4eba8d08126f39932be/chrome/browser/resources/chromeos/first_run/app_list_step.html
[modify] https://crrev.com/0c8e16bd2b7998d4eb17c4eba8d08126f39932be/chrome/browser/resources/chromeos/first_run/first_run.js
[modify] https://crrev.com/0c8e16bd2b7998d4eb17c4eba8d08126f39932be/chrome/browser/resources/chromeos/first_run/step.js
[modify] https://crrev.com/0c8e16bd2b7998d4eb17c4eba8d08126f39932be/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc