The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/10ae460d345bb14f03972f43c253c822e08ed5e2

commit 10ae460d345bb14f03972f43c253c822e08ed5e2
Author: rch <rch@chromium.org>
Date: Tue Aug 30 05:29:09 2016

Set QUIC connection's last_send_for_timeout_ to the send time of the
first sent packet after receiving a packet, even if the sent packet is
not a retransmission. Protected by default enabled
--quic_better_last_send_for_timeout

Merge internal change: 131623416

BUG= 642017 

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

[modify] https://crrev.com/10ae460d345bb14f03972f43c253c822e08ed5e2/net/quic/core/quic_connection.cc
[modify] https://crrev.com/10ae460d345bb14f03972f43c253c822e08ed5e2/net/quic/core/quic_connection_test.cc
[modify] https://crrev.com/10ae460d345bb14f03972f43c253c822e08ed5e2/net/quic/core/quic_flags.cc
[modify] https://crrev.com/10ae460d345bb14f03972f43c253c822e08ed5e2/net/quic/core/quic_flags.h

Your change meets the bar and is auto-approved for M54 (branch: 2840)

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/851a953ab4c9ca773977a3c057bb3150bdcc9cde

commit 851a953ab4c9ca773977a3c057bb3150bdcc9cde
Author: Ryan Hamilton <rch@chromium.org>
Date: Fri Sep 02 18:09:19 2016

[m54 merge] Set QUIC connection's last_send_for_timeout_ to the send time of the first sent packet after receiving a packet, even if the sent packet is not a retransmission. Protected by default enabled --quic_better_last_send_for_timeout

Merge internal change: 131623416

BUG= 642017 

Review-Url: https://codereview.chromium.org/2288843002
Cr-Commit-Position: refs/heads/master@{#415157}
(cherry picked from commit 10ae460d345bb14f03972f43c253c822e08ed5e2)

Review URL: https://codereview.chromium.org/2303403002 .

Cr-Commit-Position: refs/branch-heads/2840@{#126}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}

[modify] https://crrev.com/851a953ab4c9ca773977a3c057bb3150bdcc9cde/net/quic/core/quic_connection.cc
[modify] https://crrev.com/851a953ab4c9ca773977a3c057bb3150bdcc9cde/net/quic/core/quic_connection_test.cc
[modify] https://crrev.com/851a953ab4c9ca773977a3c057bb3150bdcc9cde/net/quic/core/quic_flags.cc
[modify] https://crrev.com/851a953ab4c9ca773977a3c057bb3150bdcc9cde/net/quic/core/quic_flags.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/851a953ab4c9ca773977a3c057bb3150bdcc9cde

commit 851a953ab4c9ca773977a3c057bb3150bdcc9cde
Author: Ryan Hamilton <rch@chromium.org>
Date: Fri Sep 02 18:09:19 2016

[m54 merge] Set QUIC connection's last_send_for_timeout_ to the send time of the first sent packet after receiving a packet, even if the sent packet is not a retransmission. Protected by default enabled --quic_better_last_send_for_timeout

Merge internal change: 131623416

BUG= 642017 

Review-Url: https://codereview.chromium.org/2288843002
Cr-Commit-Position: refs/heads/master@{#415157}
(cherry picked from commit 10ae460d345bb14f03972f43c253c822e08ed5e2)

Review URL: https://codereview.chromium.org/2303403002 .

Cr-Commit-Position: refs/branch-heads/2840@{#126}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}

[modify] https://crrev.com/851a953ab4c9ca773977a3c057bb3150bdcc9cde/net/quic/core/quic_connection.cc
[modify] https://crrev.com/851a953ab4c9ca773977a3c057bb3150bdcc9cde/net/quic/core/quic_connection_test.cc
[modify] https://crrev.com/851a953ab4c9ca773977a3c057bb3150bdcc9cde/net/quic/core/quic_flags.cc
[modify] https://crrev.com/851a953ab4c9ca773977a3c057bb3150bdcc9cde/net/quic/core/quic_flags.h