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

Change-Id: Idb6cbb94968f4a2ffe3055291f23fc903fe923a0