Snap for 11281328 from 997ed13f6474e778fb636278292ec6c62cebf0b9 to 24D1-release

Change-Id: I0d66894c115ccc68fcd47f24145a0334d1a62e18