Merge SP1A.210122.003
Change-Id: I11413a9abf82f2c1b49046c3e2eca16936b7574e