Snap for 11392538 from b6fcf7d3e8dae674c075184d6bf2600a1ef25c9f to 24D1-release

Change-Id: I8e816c986d4591cf77abc3329bf227dc4c997d59