tree 63a4ea29915195633208e9990eb0aae017d9266c
parent 81ff57f1c380ca7c8a727241beec5f9e7183a3fa
author Eric Gribkoff <ericgribkoff@google.com> 1491406941 -0700
committer Eric Gribkoff <ericgribkoff@google.com> 1491406941 -0700

backport #10100 and #10377