Snap for 12587146 from bb922977d603ddef6d2df46683529b89556481ad to 25Q1-release

Change-Id: Ia2c9dd854f4bf24b4dbf758be203e5a6e8ca316e