tree 37e99a97229f9886ebb5356671c0e7a71738d582
parent c0ed292ccbaa5b94bd3e54a85f5d7e9c1b2a1229
author Tony Wickham <twickham@google.com> 1597090303 -0700
committer Tony Wickham <twickham@google.com> 1597090303 -0700

Add back code missing from upstream merge

Change-Id: I7c2f08ed1b9c7462feabe1ad793af4ddc55aff1b