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

Change-Id: Ie9a95e883bbcebda7096d4e89feb6361af0d0211