Merge "Fix checkNotNull(a, b) usages"