Merge TP1A.210812.002

Bug: 198367246
Change-Id: I03c34c2a26825fb48a82eff78a0950d5c7996840