BUG= R=eernst@google.com, zhivkag@google.com Review-Url: https://codereview.chromium.org/2763393006 .