Import Cobalt 21.master.0.286167

Includes the following patches:
  https://cobalt-review.googlesource.com/c/cobalt/+/5930
    by zapati.ahn@samsung.com