* Applied upstream patch for critical bug bar.

* Applied upstream patch for critical bug foo.
