Merge "Nullity annotations to some tests." into lmp-mr1-dev