Snap for 8748865 from 5409851f438e90beee996d4f68a0d2408c7c4414 to tm-frc-neuralnetworks-release

Change-Id: I5187c47e5c6c5c57510691f17ebea311675a563a