Co-authored-by: Jonathan Almeida <jalmeida@mozilla.com> Co-authored-by: Arturo Mejia <arturomejiamarmol@gmail.com> (cherry picked from commit 1ea1b4ebdfe14df1b4337cd97123ffbd23e88400)