am 2c79fef8: Merge "Add missing @NonNull annotations on overridden method"

* commit '2c79fef86e6d2cce5f69a14e922cabd720710e9d':
  Add missing @NonNull annotations on overridden method