Snap for 8146243 from 90d578e9aa5a52d736975c81a57fb2d0b357991d to mainline-neuralnetworks-release

Change-Id: Iba6dc77da1333479d74189eb82fe8060083796a4