Set not null on some opticaldomain columns

Change-Id: I85271c4480a4f8c65aa0b0a5326d3b7f2e3e7007