Snap for 8745897 from 99f342e229d006c5d0d7ba93449780243e386fe7 to tm-frc-neuralnetworks-release

Change-Id: Ied7d191f59bd91da8c0af2824395ff49f6b8fa08