Merge TP1A.210812.002

Bug: 198367246
Change-Id: I9d8932df355afa3d79e7ecff8334a53c0f107c81