Merge SP1A.210122.003
Change-Id: Ie23ff0a67276f9e82af137523668be01ce30c778