Snap for 10453563 from 3bcd6a5bd79717fd982b3c94abe4d6224d5a908a to mainline-neuralnetworks-release

Change-Id: I0f62932d3753b4d36f9f28b702a89e77794e0e28