Snap for 12199801 from d2421ee19a8a70b785a364d344f3c5be1b93da79 to 25D4-release

Change-Id: I10e7ee202f6fb6b2590ea9da63ad0ff2e8501ffb