Snap for 8191477 from 774111ee1eaba69669091efaf7e24fe5d1d0cb0e to tm-frc-neuralnetworks-release

Change-Id: I3b2ae40b92d978bf4dff297adbff3dd0d3a4d872