Update to 2.2.2
PR: 222185 Submitted by: seschwar@gmail.com Approved by: maintainer timeout (20+ days)