Snap for 8512216 from 0ac94edaa71f5033042cc7aa3b266e64c41d9cba to tm-frc-neuralnetworks-release

Change-Id: Ic737b52ce7832882215d8fb8cec3f694a6d5505d