Merge SP1A.210105.001
Change-Id: Ib6c5eda42d585bf1dcb5b8359261e086cc334967