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

Change-Id: I743d3fae43073eebf1a9abecd45fe71456f4ab43