R=brucedawson@chromium.org

Bug: 714920
Change-Id: I6a0ea81e1d87fa2604e9f614a89ff48619cbffd0
Reviewed-on: https://chromium-review.googlesource.com/486085
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>