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

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