Snap for 8146243 from a9378e2681949598d8f56b374e51cf3649df02f4 to mainline-neuralnetworks-release

Change-Id: Idb48d1ca9ad47d320a8955ccaea8eb32aa65ef52