Merge "Explicitly express nullness expectations"