Cherry pick: Increase patch level: 3.2.2