Merge TP1A.210812.002

Bug: 198367246
Change-Id: I4222bedb2199c7ac2563fc91c88e2f800e118631