Merge TP1A.210812.002

Bug: 198367246
Change-Id: I5cb2d197152e61cff5ac78095820c84f66193ae2