[automerger skipped] NN validation tests am: 7ed6135471 am: cb61c34dff  -s ours
am: cfcb4f55cf  -s ours

Change-Id: I2673a4bc4b6aa5aff9dc6361f9cadb023db7bc97