Merge "Preserve existing pom2bp behavior"