32535234: Make @NonNull work with @NonNullByDefault
am: 8b7f9c81ad

Change-Id: Iff32c5834a0ec2f81894068dc35402591dea1e8c