Merge TP1A.211022.002

Change-Id: Id7ce735270ebf092637a35e26db6e6487bb2da37