Merge TP1A.210812.002

Bug: 198367246
Change-Id: I2077a922b55e02fed0cc547f5354aa4fd631c377