Merge "Add NonNull and Nullable annotations"
am: 56bd70db86

Change-Id: I1ede74a2cbb1e6a8e5d0c0e82347ec27f3ac438e