Merge "Add @Nullable and @NonNull to module API" am: 04ee825346 am: d785329abb

Change-Id: I89ff5004e3df1cde65390cbdb7119ebb47637091