Merge SP1A.210122.003
Change-Id: Ic439b29de1b72c1c0a3fda9982a946e65d56fe0c