Merge "Add NonNull and Nullable annotations" am: 56bd70db86 am: 808b57db7f
am: d83e34413d

Change-Id: I9aafeef3ecb26ec24ccd3c68affdb47b0ac53133