Merge TP1A.220905.004 to aosp-master - DO NOT MERGE

Merged-In: Ib771cdb80a51ec3a86da9a0e5d0d9eb1416ffa29
Merged-In: I8e114fba52fb1359d178bcfa7bd07fca580be3e9
Change-Id: I2dec880d51089c93f10c0801cb6fb6fb6ed4c968