Snap for 12291679 from 869f9da3d61d310742a17ced607ba545fc90f17f to 25D4-release

Change-Id: I2191772e9f8083e62519b25d66e20f9f0ab2a845