Merge "Add nullability annotations" am: 539821c978
am: 97350573b9

Change-Id: Ic81850c2976e7412e85856c5d1336f30d0691125