GitLab

Bug: 867711,867706
Change-Id: Ibbe9f7abda41b5f6d5a234ad78705b5e1dcf484a
Reviewed-on: https://chromium-review.googlesource.com/1182948
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Wenzhao (Colin) Zang <wzang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584712}