tree e4a7b1c6cfaf32ff37122b3ee15387632acb84cb
parent 41021b1a0945b967cb6efba06400af5354f2198e
author Mark D. Roth <roth@google.com> 1512491237 -0800
committer Mark D. Roth <roth@google.com> 1512491237 -0800

Apply #13336 to v1.8.x branch.