Merge TP1A.210812.002

Bug: 198367246
Change-Id: Ie7c5f9dec3d3a4d3a8a1fbfb601bf057caa25826