Changes from main moz-poc.