Merge SP1A.210122.003
Change-Id: I207bd9748a566f306fba6ba75e5db87b3493f05b