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

Change-Id: Idc4e4d59c4773832111ff4383b1aa494d539f2d9