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

Change-Id: Icd0be937c76db55d2950af8ae44f7501899be849