Enabling on trunk after having landed change to add flag and disable for
branch.

BUG=None
R=mtrofin@chromium.org,ahaas@chromium.org
LOG=N

Review-Url: https://codereview.chromium.org/2813213004
Cr-Commit-Position: refs/heads/master@{#44655}