Merge TP1A.210812.002

Bug: 198367246
Change-Id: I5e0bf861c184a3b7e43c0e339417a7ee6fb3f449