Snap for 8505378 from ddd2f63ef75b31cd37ad49725d48361c0ebff798 to mainline-go-neuralnetworks-release

Change-Id: I917fd95b9c7004f8b5bedc6dd63782fbe3c124c0