Merge TP1A.210812.002

Bug: 198367246
Change-Id: I227ff097df4ed9f8c0cd6d50526392892654fc87