Snap for 10453563 from 5d4c782b1fedfbf339e7e8a3b5547dd5b29a9526 to mainline-neuralnetworks-release

Change-Id: Ic942713b7af0b1f4fb1f46238ed80e4f40881d0e