Merge TP1A.211013.002

Change-Id: I91f68f3b488135de92dc5ebbe5bd49e27a382f00