Merge "Add Nullable/NonNull Annotations where appropriate." am: eb4d20673f
am: 17b85fea09

Change-Id: If76b57ed49a38486def933cd42722b40491487ca