Merge TP1A.210812.002

Bug: 198367246
Change-Id: I3d5a8fd5711e675652a7aefc014a6d0e082a1801