Merge TP1A.220120.003

Change-Id: I782f30f5ae241ae990aa3d0d3abca214b79ec035