Fix: 118608988 Test: NeuralNetworkTest_static Change-Id: I1f967347deae56682c6b79398e25f19a278d6707 Merged-In: I1f967347deae56682c6b79398e25f19a278d6707 (cherry picked from commit 312642b8)