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

Change-Id: I0aa589f6f114d78475bec65b0cabdb04ca435843