Merge SP1A.210122.003
Change-Id: Id16b5a8d76fc9c8bf2dea812ef09391ef86a4c28