BUG= R=terry@google.com Review-Url: https://codereview.chromium.org/2827793002 .
R=vegorov@google.com Review-Url: https://codereview.chromium.org/2698003003 .