Snap for 10716635 from 2980b54dea97f7eb59075e2836a0e1d8e1d74cdf to mainline-neuralnetworks-release

Change-Id: Ie05e0c2e1406ac0bc56cea8c21d4e2d53da0fc90