Merge TP1A.210812.002

Bug: 198367246
Change-Id: I4f57f327dbc5b16f6b533ba77606adefd0f9121f