Merge TP1A.210812.002

Bug: 198367246
Change-Id: Ia7fc2a9e2b0573b313430c78b1f36bd77673daf6