Merge "API: Add missing nullability annotations" am: e148fbcf03 am: 336e11018e
am: aaeb5c1201

Change-Id: I0fdde8f76a00a9f019629a71de4a78fb790176d4