Merge "Add nullable and nonnull annotations" am: 6e7e6c5b5a
am: bb2ad91ecb

Change-Id: I4dac2edaad0776318ec927a0f575d02077ff5027