Merge TQ2A.230405.003

Bug: 271343657
Merged-In: I7ab4f168a95f75760d12aa349ee1d98837cbf80a
Change-Id: I9c04d414f0e78f76c16f8a8166871ec1f0360a3f