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

Change-Id: I5c86cf96b946851832d6b77b370b87521d3a223c