tree b1ae525fe5312513b29883ad4ae8c6ed2f3e6e27
parent a0e62d9f1a5f24cbc9d16bb9d1c4b606e960b2af
author David Schuldenfrei <david.schuldenfrei@gmail.com> 1535385301 -0400
committer Gennadiy Civil <misterg@google.com> 1535386953 -0400

Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7f42e8ae66ea365b5b8508fecb31509

Closes #1658

Review and changes, mister@google.com

PiperOrigin-RevId: 210374286