Merge TP1A.210812.002

Bug: 198367246
Change-Id: Iada4980c209514bf6db2f46561d508880d9a9aa1