Merge TP1A.210812.002

Bug: 198367246
Change-Id: I1bd569ae57a6c4297e771772f19ab46175ac457a