Merge TP1A.210812.002

Bug: 198367246
Change-Id: If5342bed00fb45e43d51d61d6e93b60e0b6564bd