Merge "Add nullability annotations" am: a1ee1fc888
am: 3d48153a8f

Change-Id: Ic81850c2976e7412e85856c5d1336f30d0691125