am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev

* commit '4f8a999682fdb8b38ee5671b8a8f527569ebb5ff':
  Nullity annotations to some tests.