Snap for 8736885 from 6c12f28f9c8bc344992ce3c08409a981cd88d4c1 to mainline-go-neuralnetworks-release

Change-Id: I25a5a0849f06096b60ed537fbb5b86240fc9e5c3