Merge SP1A.210122.003
Change-Id: I834a0ba5131769c454a13479cce2c7fcccd87950