Merge TP1A.210812.002

Bug: 198367246
Change-Id: Ib44383af399cdd238219c671cf9362be1f7ddfde