Backport note:
This includes change I0abbd535aacc03446ada0fa806dfdfdaa4522afe which
fixed the wrong explanation in the release note file.
Related-Bug: #1999665
Story: 2010484
Task: 47052
Change-Id: Ifc51ff6a4deab05002ccded59383416f9a586aa0
(cherry picked from commit c1b5fcfbe37d3f94d5b73ae36e071d1aa8c4e0f5)
(cherry picked from commit 436ecad6511b30683f6b9af4e484ed64c3bcaab9)
(cherry picked from commit c50d720aa36fd7553b133a5a2f4fefdb3040211f)