Merge TP1A.210812.002

Bug: 198367246
Change-Id: I82ef89ac19021f7e42fd33690ea3f4dc4b2a696a