Merge "NN validation tests" into pi-dev
am: dec4a73d2c

Change-Id: I58a2da3e156c5eb92411f06819c40cd15d9ffc8a