Snap for 11881322 from ddd417d3ff2880c95e2ff4a65983755772f8a8fd to 25D4-release

Change-Id: I081f163d9cf122c036d2f4d24cdfeb3c3f6c071e