Merge TP1A.211006.001

Change-Id: If54f8d960310495b519a372b97a06d1a65808bdf