Merge TP1A.210812.002

Bug: 198367246
Change-Id: I2c56871e214bb319ef76b36e2a8772896ce3ca8f