Snap for 7132927 from 7cb3e5004c6db8db233d7b03b8ca1105e8ef7928 to mainline-neuralnetworks-release

Change-Id: I3b5aad88f4ded1dbfe70fc947ea93035aa876e82