Merge TP1A.210812.002

Bug: 198367246
Change-Id: Ic3ca29ab0f8fc78196d1ce1bcf0657cbb1bfbbcb