Snap for 12159347 from 7906bc32039ac241ecdea3103d385e3638a98c6a to 25D4-release

Change-Id: I008505b39e293c30b8cc6be1aab386c926db74d6