Merge "Add assertNotNull to prevent null analysis warnings"