Merge TP1A.210812.002

Bug: 198367246
Change-Id: I390e97d648b4c938175506ebe121ca61c78c0218