tree 3c49145db0268c07349a42bafc7352c80c12305c
parent 5cf4b44fff8755edc9bdc46284d6cd270bc4a162
author Mark D. Roth <roth@google.com> 1512504394 -0800
committer Mark D. Roth <roth@google.com> 1512504394 -0800

Apply #13336 to v1.7.x branch.