Snap for 12260156 from 0b23bca6317056b0bae89fa5957a7322e7be310a to 24Q4-release

Change-Id: Ida70aa4a9702c118e3e704466c97970d7c41a4cf