Merge SP1A.210122.003
Change-Id: I31aa42581e12f34020b938c3a860f1e5fa466394