Merge "BPGen update default imports"