Merge UP1A.220921.002

Change-Id: If85b5d9a3cee4fde0f22c461882ec98f0a262c51