Merge "Add more nullability annotations" am: 3f2d69dc62 am: 03a6eadb2d
am: 656fadca4f

Change-Id: I4ed58e65f295a735e507ac55abe920224fe26f54