Merge "Add more nullability annotations"
am: 3f2d69dc62

Change-Id: I9b815b25cd48a5e24506f3f50fc6370bac1af552