Snap for 12282710 from 9cc20bf36aa66552c37925c669ff8078b34cee1d to 25D4-release

Change-Id: I8b371cf4f29fd87aa6e45b758a679894778d1ead