Snap for 12097883 from e6eb7563813601a9dfd94fe94a3d8b90a810049e to 25D4-release

Change-Id: Ia487b049542f73a8fe089ddb42fc8c6efd0a4d59