Merge TP1A.210812.002

Bug: 198367246
Change-Id: I811e30e76041eb0e513dae3e700bb5db8e1f909f