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

Change-Id: I1e2f40e60dfb55810d7978cd00f91411ed91fa5a