Merge "Add @Nullable to new method" am: 70c0efdd86
am: 2948be98c2

Change-Id: I6f73879bd791af4ce2e0f6669a2d39f3648a5595