Merge TP1A.210812.002

Bug: 198367246
Change-Id: I1f32f481d68b4d71e15a1fa320a9c6d775840c25