Merge TP1A.210812.002

Bug: 198367246
Change-Id: I297bd1269963edf5f03177d794e50cbcdf0f64e9