Merge "feat(errata): implement workaround for DSU-120 erratum 2900952" into lts-v2.10