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

Change-Id: I6b092f370a8b2eba20d19c6e43b4e5f5b217af16