Snap for 11604336 from 5bbccdf9dcb2abbb06b18b544ed24b4ce9f39002 to 24D1-release

Change-Id: If984d21391cef663b656ea171ddb2b8775558f18