Snap for 11869550 from 617c91199705d952ffb178b8d143df036e69cab7 to 25D4-release

Change-Id: I1ad62d314c938f3e81272ed72c4317d9ade364eb