Merge "Support NN dev in O-MR1."