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

Change-Id: I61943d8e33dc94d780401448a8acc716966a5763