Merge TP1A.210812.002

Bug: 198367246
Change-Id: I9926f039318a0c9bb834ee5d6760aa069f69b163