Merge "Add nullable and nonnull annotations"