Merge SP1A.210105.001
Change-Id: I46e936446f170f4db872a97f5ba3012578c33866