Snap for 11386347 from d320610de84fdb7b07101cf0023915ff998f0ca7 to 24D1-release

Change-Id: If4a6ab9f3861e202e4822eea2d75978727e31533