Import Cobalt 20.master.0.243969

Includes the following patches:
  https://cobalt-review.googlesource.com/c/cobalt/+/5610
    by r97922153@gmail.com