Merge TP1A.211214.001

Change-Id: I73ba05a973a9d6246de68c6e52832082c0803c95