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

Change-Id: Icce4efc896b2d246e7aa9463329ce9c4b88120d2