Merge SP1A.210122.003
Change-Id: I0fc4a1c6af87b43b480d63fd08851723572844fc